Added better loading functionality, consolidated stylesheets and scripts