Scoped new expenses and editing, added calendar