refactoring layout
Merge branch 'admin' of github.com:hacklabr/timtec into admin
Merge branch 'admin' of github.com:hacklabr/timtec into admin