commit changes to layout and main.js
commit changes before swtiching branches
fixed merge conflict
improved controllers