some cleanup at Feed

Wireframe v1 added