Merge pull request #21 from kacper-zylka/wojtek

Button and navbar js's conflicted so fixed that
Brushed up CSS