Finished changing file extension check.
Added checking for image types.
Starting layout work.