Some Changes to layout