Finished frontend changes