[WIP] Updated layout on home and channel view

/cc @mutle