1) Rewrite code 2) Added full details view