Styling finalise. Few TODO left