UI refactor to wireframe