app rendering reorganized
fixes and small perf boost