Improved layout without using tables
Layout fix