fixes and feedback page reorg