Add toolbar button action and add fix space buttons