WIP on css restructure