Added the rest of the buttons. Realigned the layout slightly.