Added top buttons and bottom bar