Various config things and tweaks to the layout