Working on dashboard ui. Now properly fixes #12
Manual Merge