fixing main styling
Merge branch 'develop' into release/alpha