almost fully ported UI to new layout system