Adding buttons and tabs