Interface Tweaks and code cleanup