Further cleaned up interface, fixed interface display bugs