Design fixes
Design fixes