Major UI change along with Entry Form page