Div fixes and cleanup