Removed design oddities