Frontend

Fixed Frontend issues before beta released