Various layout updates, also a toolbar to jump down the page