modify homepage, add cherry street controller and view
Fixing merge issues