Reworking CSS and laying in basic components