Fixed a few buggy design things