Moved buttons to tab bar