Adjusted wdat main template
Resolved most important layout issues