[UPDATE] Cleaning front views