modify icons
Fix layouts