Major update, general UI stuff mostly