Finish layout, working on register visual updates