Solved some layout problems