Removed desing oddities