layout done
Merge branch 'master' of https://github.com/KernelCorp/nika
Merge branch 'master' of https://github.com/KernelCorp/nika