Corrected some layout