Fix DOM drop error, some graphical improvements. Closer to brand. (ms)
merge conflicts (ms)
Merge branch 'frontend' into development