GUI fix 2