Frontend improved