More optimisation and GUI resize fixes.