Cleaned up some more design elements (DHH-87)