Some layout and javascript adjustments
More layout, js