Add random button position
Code refactoring