added joel; fixed layout