Frontend

Fixed some issues