changes to calculator button positioning, navbar ordering