:construction: use push/pop controller instead of modal