Solved some layout mistakes