Fixed buttons loading problem