Some frontend improvements