Tweaks

Further final tweaks (User Interface)