Appearance and constraints tweaks