Updated spacing and layout