Added custom logo. Rebase + comments in code