Refactor and simplify. Update UI to Auto Layout.