Enhancement: Fixed some usability issues