Minor fixes
Typo
Convert views to HAML