merging with a more web friendly UI