added buttons to toolbar, changed toolbar layout