layout updates and javascript cleanup