Tweaks and graphical updates

Moving things and such!