Design Overhaul - Take 2

Hope this works.