Fixed a few design things