fixing few layout related things