Tidied up interface
Macros work
No more Metro UI for when it's eventually ported to Linux/MacOS (still need to remove dependency)