Cleaning up layout, installing new gems and cuke