Make frontend more user friendly