modify rest and bar design
Merge pull request #3 from haazime/refactor-rest-and-bar

modify rest and bar design