desing changes & bug fixing