Few more style tweaks including modal fix