Design fixes, WIP