[UPDATE] Review whole front end