add some desing changes