Merge CSS and JS

New ambitest layout
Refactoring with partial