Updated, also got rid of CSS loading flash.