Fixing singleton problem with options
Adding picture in header