Made a few additional changes to layout