Layout and Float Formating fixed