Fixed all controllers
Added some js