Changed overall design