A load of changes

Changes the order of js concat.
add 2 layouts. Got precompilation working.