GUI bug kinda fixed. clean up.