Cleaned up user interface
Merge branch 'master' of https://github.com/lizter/EIT_ORK
Merge branch 'master' of https://github.com/lizter/EIT_ORK