You may want to consider a different filter than the one you are using now, at least one rated for 30Gallons and throw in some more gravel and a couple plants.
I was in your boat about two months ago, my son brought some feeders home from a wedding and I just bought a cheap ten gallon starter...