Clean up UI. add nav bar.
update layout.