Merge old codebase. UI changes.