frontend stuff
merge frontend
Minor adjustments