incorporated the theme but still a layout issue