Some changes to the layout, hopefully for the best