#226 Moved all buttons except add new to action bar