Light rearranging and a new font
Delete a line because I don't know what it does