Bug fixes, UI improvements.
Merge branch 'master' of https://github.com/Highvolt/FEUPdemic