update gemfile and integrate layouting