Fixed some usability issues