less logging
less logging
layout fixes