TASQ-22: Styling of display + some cleanup
TASQ-22: Final cleanup , move navigation to table