Revert "improved stability and overall look and feel"

This reverts commit 20545258e4e2a736962061197d54caaf4ffc74c6.
Merge remote-tracking branch 'vendor/master'