Remove intrusive style
Fix layout issues