Revert "gui updates and etc"

This reverts commit 18569ee5e4b6d2bde1d7b928d98659ea7ffe51da.