Separated styles and js. moved some stuff