Misc styling fixes
Fixed flash persistence errors
Merge branch 'feature/style' into develop