First big commit. Big Chances to gems and layout