fix tools markup
move composite tools to viewlet
add CompositePage to default view option