Proper code structuring

Reworked css