fixed few layout bugs