Remove some variables and fix some nunjucks stuff
Merge pull request #5 from alicoding/fixes

r+
Making changes to server and keep it consitance