Code cleansing and layout

Layout finished! yay! Well... maybe a few details to really complete