added buttons and shit