Merge pull request #731 from sexnothing/bootstrap3

Layout admin update
Code cleaning
Code cleaning
Layout admin update