Design fixes

Signed-off-by: Daniel Francis <francis@sugarlabs.org>