Updated UI

Fixed issues #7 #8 #11 and #13. Partial fix to #9