Finished off bug fixes and improved look of most of the app