Almost totally fixed GUI