Bug fixes, moved images