Fixed some frontend issues