Changed template structure
Fixes for 1024 layout