Clean up styles
Display a little extra data
More stuff todo