* remove deprecated styling, and small fix attempt
Merged changes