Adding buttons and icons