Improving the look and feel now a theme has been included