Added roster templating. Minor UI changes