changed frontend structure