Fix #55 Removed tiny injections in headers, minor refactoring of sass structure