added new roles and cleaned up layout...