Task checks and HAML refactors