Added context menu to roster
Cleaned up template structure