links and layouts fixes
deleted baseurl
merge fixes
header logo fix
header fixes
Merge pull request #99 from Label305/hotfix_links

Hotfix links