added new pages
fixed components