Small changes to layout, adding stuff