Fixing some presentation issues