Layout redesigned for tabs