UI changed for homepage
merge