added controller screen and push support for navigating server configs
merging