Updated layout and configuration a bit