Fixed issues with design elements