Bug fixes  + style shifts