Fixed minor issues and udpated subscribe button
Merge branch 'issue-223' into develop