OKAY THE FINAL FINAL COMMIT

Fixed a couple alignment issues