Applied changes and reformatted

Manually applied jt0dd’s conflicting changes, fixed some formatting
things, and changed default image, which should have changed with the
new design