UI Edits and Model Additions