Revert "New branch for developing proper GUI"

This reverts commit 4170e4386634099e91546f9bc6428f699f2cea4f.