Tweak layout and options