Removed button thingy
Background image
Fixed conflicts