Adjust layout; Added extensions class.