Started work on Button Improvement