added more changes to layout