Merge UI changes and additional pages