More Restyling. Cleaned up JS too.