cleaned up fw/wf display code
working on improving data displays