made a few more changes to layout