Fixed button context and added some text