Some style fixes on issues new modal usage