Merged back forked version of repo

UI improvements
Minor experience and visual bug fixing