Design fixes for first beta