Fixed UI issues 

Addressed issues #37 and #38