Changed some design things