Fixed some Layout issues