Fixed several issues found in user testing