Added button edges and button states