Logo Layout Adjustments

Cleaning up some spaghetti code.