reorg
work on look and feel