Fixed UI and changed serializer for simpler flow handling on client