Fixed usability issues