Reorderd javascripts and got rid of test popups
added some style