changed: refactored base layout & includes