Switch ids to classes inside .module and improve markup for outline