Bug fix. Test green. Move to top with javascript