(fix/feature) Styling