Fixed init command. Updated layout