Moving soon: New Tank - Aquascape ideas?

[skillful abbot]

I'll be moving very soon, and plan on buying a 60cm tank this weekend. My plants are doing so well, small just doesn't cut it anymore, and though I like the pots at first, they deter from the natural look, so I want to go with the ADA amazonia soil and plant everything in it..

I plan on moving everything from my two tanks

-Yamato Shrimps x5
- two zebra danios
- two dwarf puffers
- a lot of plants


http://imageserver1.textamerica.com/user.images.x/2/IMG_428802/220x220/_0304/TZ200304181451558.jpg?220.220.428802.2 (http://skillful-abbot.textamerica.com/?qs=xdefault&r=5714825)
First Floor Tank

http://imageserver1.textamerica.com/user.images.x/2/IMG_428802/220x220/_0304/TZ200304181456949.jpg?220.220.428802.2 (http://skillful-abbot.textamerica.com/?r=5714826)
Second Floor Tank

Im also going to pick up a new heater, another small canister, and some Amazonia.

The thing is I have so many kind of plants I don't know how I should arrange them.

I have the small piece of drift wood with Anubiasu Nana attached and the Wabi-Kusa
I have the windelov fern attached to a small rock, the amazon sword, willow moss I attached to a lava rock from Mt. Fuji [hand picked lol], and some susswassertang I just tied to a rock last night.

My other plants:
Alternanthera reineckii
Bacopa monnieri
Java fern (in gravel)
Limnobium laevigatum [frogbit]
hydrocotyle leucocephala [Brazilian pennywort]
Dwarf GrassI want to incorporate my current gravel with the amazonia as well just because it still has the good bacter living on it.

Any suggestions about placement and layout?