TODO comments, edit account type and move CSS classes to view layer