Fixes to first commit... css and js was not properly applied
Fixes to first commit... css and js was not properly applied. Merged from branch