Fixed Button Issues