rename vars and methods to more appropriate ones
fix additional toolbar button location and style