More layout updates, test refactoring