Some refactoring of UI + added follow/un-follow button