Updated nav and layout files to haml