Improve roster view

Also do some refactoring