Revert "Dropped initial ui error pages"

This reverts commit 5ed644d954f178550c0b4efc5eaad563143c0a85.
Revert "Revert "Dropped initial ui error pages""

This reverts commit 0eee47e50802384f0430f861bd4787eae52e907f.
Did some upgrades

Just some more code