finish layout
Merge branch 'master' of https://github.com/sw5813/heartbeat