Fixed merchant inventory generation
tweaked button locations so that the options button appears fully in the window