Finished tinkering with layout