Fix post issue. Move JS around