removing as pre upgrade notice
improving ordering of views
tweaking layout