Updated screens & minor model changes