Updated logo, login view, feed view
Fixed merge issues