refactored sass layout