Fixed some bugs + added brand logo