Finalish UI fix

Should work…