Fixed Some Layout Issues