[FIX] layouting issue fix
[CHG] some minor layout changes