Improved CSS, scaffolds to be added later on