Buttons Fix & Refactoring For Speed Increase