Frontend Improvments