Improved haml & links order