Make new more compact
Fix visual bugs