Cleaned up and added follow buttons