Change to a modular style

Change the style to allow for more elbow room in the future.