Added follow btn and some minimal changes