UI Tweaks

More tiny tweaks to meet the design.