Fixed HAML issues