tweaking and cleaking up templates and sass