Fixed layout issues

Fixed #11 
What's this for?