Repack, draw UI correctly (almost)