Interface Enhancements

-UI enhancements
-bug fixes