Last minute fixes (by Adel)

Styling issues