Added button improvements