Cleaned up some styles and added several new