added some user feedback and refind the layout code a bit
added some user feedback and refind the layout code a bit