The AddEditScreen is a bit convulted and some parts don't really follow compose best practices. I would like to clean it up