Fixing avatar check and adding term and condition page