cleanup
styling
markup for public private switch
rearrange routes