Moved some js, css