UI for remixed page
Fixed merge conflicts