layout fix
layout tweaks