Moved buttons out