Make MainToolbar and MainPageBar public, change constant values