Finish a better layout