Added button control, changed color scheme