Functionality and UI overhaul #1

Merged
tsimonq2 merged 5 commits from arraybolt3/work into master 2 years ago