UX improvements

https://github.com/pfraze/phoenix/issues/82#issuecomment-58886371