removed type dropdown
Merge remote-tracking branch 'origin/dev-removeTypeDropdown' into dev
Fix padding issues.