Last commit before submission, fixed some sizing issues