Tweaks to layout and removing some CLUG stuff