small fixes
more small fixes
layout updates