Fix defaults, prepare for auto-layout