Reconfigured everything
Updated style
Merge branch 'dev' into beta