DEV: Seperate css DESIGN: Clean-up