Changed button images, and fixed Ui isues
conflict resolution