Moved assets to correct place
Various bug fixes