Entrance redesign

Soluciona #31 y #32