Some tidy up and added isometric projection