cleanup display config
back to old commit, fix conflicts