Some Layout Design Changes