Modifing layout.

Layout still not working correctly...