Fix errors from moving images to resources

-Some formatting changes and import organization