UI/UX updates
Merge branch 'dev' of github.com:blazeqwest/epsilon into dev