added more frontend stuff
merged
merged