added some logic and new pages in UI and BO layer