some tweaks in layout