Add layouts, initial effort to scale UI