Moved some stuff around. Don't know if it is better now