Adjust variables, unbreak UI