Fixed user name validation
Restructured presenters code