Merge "Revert "First commit of dynamic home page feature""