Made shop much more robust and updated usage of UIButton