Fixed issue with logic

Fixed buttons and logical issues (enabling/disabling according to page)