Tweak layout; change tabbing behavior