Update version number and rearrange toolbar