More modularity and better scss [touch:mishuevos]