Revert "Needs reverting"

This reverts commit 4abfcd2e376471943c9f700f7e590b524c2beae1.
Toolbar added